Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(operator): add alertmanager client config to ruler template #13182

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fix(operator): add alertmanager client config to ruler template #13182

merged 2 commits into from
Jun 13, 2024

Conversation

aleert
Copy link
Contributor

@aleert aleert commented Jun 8, 2024 •
edited
Loading

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #13181

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@aleert aleert requested review from periklis, xperimental and a team as code owners June 8, 2024 13:26
@CLAassistant
Copy link

CLAassistant commented Jun 8, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

periklis
periklis reviewed Jun 12, 2024
View reviewed changes
Copy link
Collaborator

@periklis periklis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and much appreciated closing this issue. I believe this is a big miss in the code base due to the fact that most of the operator users are using the alertmanager client config per tenant.

Requesting just a quick make bundle-all to update the bundles before releasing this.

@periklis periklis changed the title fix: add alertmanager client config to ruler template fix(operator): add alertmanager client config to ruler template Jun 12, 2024
@aleert
Copy link
Contributor Author

aleert commented Jun 12, 2024

@periklis done.

@periklis
Copy link
Collaborator

Sorry forgot to point to make docs/operator/api.md to get the docs action passing here.

@aleert
Copy link
Contributor Author

aleert commented Jun 12, 2024

Should be fine now.

@aleert aleert requested a review from periklis June 12, 2024 21:39
@periklis periklis merged commit 6148c37 into grafana:main Jun 13, 2024
66 of 67 checks passed
@grafanabot grafanabot mentioned this pull request Jun 4, 2024
Merged
@periklis
Copy link
Collaborator

@aleert Thank you very much for your first contribution to the Loki Operator. If you happen to have time, please join on the Grafana Community Slack chanel #loki-operator-dev for a quick chat to tell us where and how you use the Loki Operator. I would appreciate feedback on improvements and future direction.

This was referenced Jun 17, 2024
Merged
Closed
@loki-gh-app loki-gh-app bot mentioned this pull request Jul 1, 2024
Closed
@grafanabot grafanabot mentioned this pull request Jul 2, 2024
Open
This was referenced Jul 3, 2024
Closed
Closed
Closed
@RodrigoCMoraes RodrigoCMoraes mentioned this pull request Jul 12, 2024
Closed
@loki-gh-app loki-gh-app bot mentioned this pull request Jul 15, 2024
Closed
@loki-gh-app loki-gh-app bot mentioned this pull request Jul 22, 2024
Closed
@grafanabot grafanabot mentioned this pull request Sep 11, 2024
Merged
@loki-gh-app loki-gh-app bot mentioned this pull request Oct 18, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@periklis periklis periklis approved these changes

@xperimental xperimental Awaiting requested review from xperimental xperimental is a code owner

Assignees
No one assigned
Labels
sig/operator size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Alertmanager client config present in Ruler CRD, however no config is generated
3 participants
@aleert @CLAassistant @periklis